Consolidate integration to one Connection screen - #102265

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

1. Look at the code and make sure there are no malicious changes.
2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx bun ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx bun ./scripts/generateTranslations.ts --compare-ref main

@situchan Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Sorry, marked it as ready by mistake. It's still in progress.

Please check below findings:

A connection that only works in Expensify Classic doesn't show up on Connections. useAccountingConnectionListings.ts:74 only looks at New Expensify integrations. On main, the Accounting page hides the list of integrations to connect and shows "Go to Expensify Classic" or an error instead. The Configure panel copied that check (ConnectionsAccountingPage.tsx:150), but you can only open the panel from a connected card, and no card appears here.

1. Use a workspace connected to an integration that only works in Expensify Classic.
2. Go to Workspace > Connections.
3. Notice that there's no connected card, and every accounting provider has a "+".
4. Click Xero. Notice that setup starts with no Replace prompt.

Saving a Final approver from the HR Configure panel closes the panel. The Final approver pages still go back to the old HR page: GustoFinalApproverPage.tsx:30, ZenefitsFinalApproverPage.tsx:30 and MergeHRFinalApproverPage.tsx:31. I found this by reading the code and haven't tried it in the app.

1. On a Control workspace with Gusto connected, go to Workspace > Connections.
2. Click Configure on Gusto.
3. Make sure Approval mode isn't Custom, then click Final approver.
4. Pick a member.
5. Expected: you're back on the Gusto Configure panel. Actual: the panel closes, the URL ends in /hr, and the tab resets to All. The back button does the same.

The onboarding accounting task says "Click Accounting".
Beta users have no Accounting menu item (en.ts:3719). The link still works because /accounting shows Connections, but the written steps don't match.
The issue says onboarding shouldn't change, so please confirm this is OK while the beta is on.

Regression review

Beta off: I found no regressions. Every changed path either falls back to the old value or adds a new argument with a default that keeps current behavior. That includes the shared TabSelectorBase and MenuItem changes.

Beta on: I found 2 navigation regressions and 3 behavior changes. These come from reading the code at c333a7d. I didn't reproduce them in a browser, because they need a workspace with connected integrations.

Regressions

1. Back from some accounting settings pages closes the Configure panel. The QBO Export, Xero Export, Sage Export, QBD Advanced, and Certinia Export/Advanced handlers build their route from the old /accounting base. Back resolves to /accounting and closes the right-hand panel. Then it swaps the Connections page for the old route.

   • Base path: accounting/utils.tsx:98, used at lines 181, 247, 358, 400, and 482-484.
   • Hard-coded goBack(POLICY_ACCOUNTING): XeroOrganizationConfigurationPage.tsx:98, SageIntacctAdvancedPage.tsx:111, and QuickbooksDesktopImportPage.tsx:71.
   • Repro: connect QBO, then open Connections > Configure > Export and press Back. The panel closes and the URL changes to /accounting.
   • Fix: use the current route as the base, as NetSuite and QBD Export already do, or use getAccountingConnectionsRoute.

2. HR/Recruiting sync results can open Not Found. useMergeSyncResultsPage.ts:57 adds the results suffix to the active route. When Connections renders under an old route such as /accounting or /receipt-partners, that screen isn't in the entryScreens list at ROUTES.ts:1315. The path then falls through to Not Found. Many existing links still point to /accounting, including Fix connection, onboarding tasks, and empty states. This is medium-low confidence.

situchan's Not Found report (beta turned off while on /connections) is confirmed. WorkspaceConnectionsPage.tsx:369 blocks the page without redirecting to the old page. The same happens when a user without the beta opens a shared /connections link.

Behavior changes to confirm

• Features turn on before a connection succeeds, and can't be turned off. AccountingContext/index.tsx:161-171 enables Connections before the Control upgrade check. If you abandon the upgrade, the feature stays on. HR, Uber, and MCP clicks work the same way, and the More features toggles are hidden for beta users. MCP has no disconnect state, so beta admins can't turn it off.
• Uber "+" may do nothing. useReceiptPartnerConnectionListings.ts:57-60 returns silently when connectFormData is missing. On main this button was only reachable with Receipt partners turned on. If the API leaves this data out when the feature is off, the click shows nothing.
• The tooltip also shows for new workspaces. TOOLTIPS.ts:118-124 has no "existing users only" check. This matches trjExpensify's question about the tooltip on a new trial account.

Next Steps: Reply with @MelvinBot <your feedback> to refine this review.

view run

🤖 Web test steps verification results: ⚠️ partial

With the beta off, More features and the Create expense tabs behave as on main. With the beta on, the single Connections item, the Connections page, and the Uber panel work. Clicking "+" on Claude moved the test browser off the app, so steps 7 and 8 couldn't finish.

Step	Status
1. Beta off: More features shows the Integrate toggles The Integrate section shows Accounting, HR, Receipt partners, and MCP toggles.	✅
2. Beta off: Create expense tabs render and switch normally (shared TabSelector change) Switching between Manual and Scan works. Distance is a separate quick action in this build, which is unrelated to this PR.	✅
3. Beta on: one Connections menu item, and no Integrate toggles in More features The menu shows Connections and no separate Accounting, HR, or MCP items. More features has no Integrate section.	✅
4. Beta on: the "New: All your connections in one place" tooltip on a brand-new account No tooltip appeared on Connections after several visits. So the "tooltip shows for new workspaces" concern from my code review didn't reproduce here.	❌
5. Beta on: /workspaces/<policyID>/accounting renders Connections The tester didn't enter the URL directly, because a reload risks losing the session. Opening Connections from the menu rendered the page with its tabs.	⚠️
6. Beta on: "+" on Uber for Business An in-app panel opened with the 5% offer and a "Connect to Uber for Business" button. This isn't a silent no-op.	✅
7. Beta on: "+" on Claude, then check whether any UI can turn MCP back off The test browser moved to claude.ai in the same window, and the session ended. This is likely a quirk of the headless browser rather than a PR bug. useMCPConnectionListings.ts:51 uses the same openExternalLink as the old MCP page on main. The tester couldn't check the MCP turn-off part.	❌
8. Turn the beta off while on /connections, then return to that URL Not tested, because the session had already left the app in step 7.	❌

view run · view recording

@Krishna2323 we're aiming for early next week on this one when you have a second to get back to it.

Working on it, should be ready again in few moments.

When beta on, Accounting page has multiple routes to access. (/connections, /accounting)
So this leads to a bug of not found page when turn off beta while on /connections route

This only happens when the beta is turned off while on /connections, or when someone without the beta opens a /connections link. Once the beta is removed, /connections will be the only route and the old pages go away, so I'd rather not add a temporary fallback. Happy to add one if you think it's needed before then.

Was "Need help connecting? Read our guide." intentionally or accidentally removed in new MCP page?

With the beta on, the MCP page is replaced by Connections, which doesn't have the "Need help connecting? Read our guide." row. @dubielzyk-expensify should I add it back under the grid on the AI tab?

Tooltip on a new trial account.

@dubielzyk-expensify @trjExpensify right now the "All your connections in one place" tooltip shows to everyone with the beta, including brand-new accounts. We dropped the cutoff date because the beta rollout makes any fixed date wrong. One option is to show it only on workspaces that already used Accounting, HR, Recruiting, Receipt partners or MCP before. Is that the right rule, or should "existing user" mean the account rather than the workspace?

MCP can't be turned off

@MelvinBot With the beta on, More features hides the Integrate toggles, and MCP has no connected state on Connections. So admins have no way to turn MCP off, and clicking "+" on Claude turns it back on if it was off. @dubielzyk-expensify should we keep the MCP toggle in More features for beta users, or add a Configure panel on the MCP card with an on/off switch?

@situchan,

1. Classic-only connection: this isn't reachable. SUPPORTED_ONLY_ON_OLDDOT is empty on main too, so main's "Go to Expensify Classic" branch never runs, and Connections behaves the same.
2. Final approver: fixed, it now goes back to the Configure panel.
3. Onboarding "Click Accounting": the link still works, because /accounting shows Connections when the beta is on. The issue says onboarding shouldn't change, so I left it. @trjExpensify OK to keep it as is while the beta is on?

Fixed items:

• Back from settings pages: fixed, including the Xero, Sage, QBD and Certinia export sub-pages. They now resolve from the current route, like QBO and NetSuite.
• Sync results Not Found: fixed, the old integration routes are now allowed entry screens.
• Features turning on before connecting: intended. Accounting has to turn on before the Control upgrade so Collect workspaces can connect NetSuite, and HR and Uber follow the same pattern. The MCP gap is covered in my question above.
• Landscape tooltip: fixed. The tooltip now hides while Connections is off screen and shows again when you scroll to it.

@MelvinBot review

With the beta on, the MCP page is replaced by Connections, which doesn't have the "Need help connecting? Read our guide." row. @dubielzyk should I add it back under the grid on the AI tab?

I think it would be cool to add it back to the AI tab. 👍

None of the fixes you listed are on the branch yet. The head is still 01642d3, which only merges main, and nothing after c333a7d touches these files. Can you push the fix commit? Then I'll re-check it.

What's still in the code at 01642d3:

• Back from settings pages: QBO, Xero, Sage, QBD Advanced and Certinia still build on /accounting (utils.tsx:98, 358, 400, 482-484). QBO Export uses this base too, so only NetSuite and QBD Export follow the current route today. When you fix it, also check the export subpages that go back to /accounting. Examples are the DynamicXero*, DynamicSageIntacct* and DynamicQuickbooksDesktopExportPage pages, plus CertiniaExportPage.tsx:126.
• Sync results Not Found: ROUTES.ts:1315 and 1321 still leave out ACCOUNTING.ROOT, RECEIPT_PARTNERS and MCP.
• Final approver: the Gusto, Zenefits and Merge HR final approver pages still go back to WORKSPACE_HR (MergeHRFinalApproverPage.tsx:31), not to the Configure panel.
• Landscape tooltip: the menu still relies on shouldHideOnScroll (WorkspaceInitialPage.tsx:341-348). Its ScrollView never emits CONST.EVENTS.SCROLLING, so the tooltip never re-checks its position. InitialSettingsPage.tsx:132 shows the useScrollEventEmitter wiring it needs.

MCP: I confirmed the gap is still open, so the question to design stands. The only way to turn MCP off is the Integrate toggle in More features (WorkspaceMoreFeaturesPage/index.tsx:372), and it's hidden when the beta is on.

Features turning on early: that reasoning works for Accounting and HR, so I'm fine leaving them as they are.

view run

@dubielzyk-expensify @trjExpensify right now the "All your connections in one place" tooltip shows to everyone with the beta, including brand-new accounts. We dropped the cutoff date because the beta rollout makes any fixed date wrong. One option is to show it only on workspaces that already used Accounting, HR, Recruiting, Receipt partners or MCP before. Is that the right rule, or should "existing user" mean the account rather than the workspace?

That might work. I take it you're talking about the areXenabled: true flags? The other thing I thought about was maybe looking at workspaces that have a connection in policy.connections

Classic-only connection: this isn't reachable. SUPPORTED_ONLY_ON_OLDDOT is empty on main too, so main's "Go to Expensify Classic" branch never runs, and Connections behaves the same.

I don't think we have any OldDot only connections at this point since we finished building Certina, so I'm not sure if this is necessary anymore?

Onboarding "Click Accounting": the link still works, because /accounting shows Connections when the beta is on. The issue says onboarding shouldn't change, so I left it. @trjExpensify OK to keep it as is while the beta is on?

Yeah, what we meant by this is is that we should still advertise "Accounting", "HR" etc. But before, disabling Accounting would disable Accounting in the workspace - and that's obviously not a thing now. 👍

The branch hasn't changed since my last review. The head is still 01642d3, so the findings there still apply. Push the fix commit and tag me again, and I'll re-check it.

view run

@MelvinBot pushed the changes, please check again

I re-checked the branch at eb206d8. All four fixes are in, and I found no new beta-off regressions. Two smaller items are left.

Fixed:

• Back from settings pages. QBO, Xero, Sage, QBD Advanced and Certinia now build on the current route. Their subpages use useDynamicBackPath. Every dynamic route you made relative lists both ACCOUNTING.ROOT and CONNECTIONS_ACCOUNTING as entry screens. With the beta off, the current route is still /accounting, so nothing changes there.
• Sync results Not Found. Both result routes now accept the old integration screens (ROUTES.ts:1315-1340).
• Final approver. Gusto, Zenefits and Merge HR now go back to the screen you came from.
• Landscape tooltip. The menu ScrollView now emits scroll events, and the first display re-checks whether the anchor is on screen.

The MCP help link and the "connected workspaces only" tooltip rule (WorkspaceInitialPage.tsx:215) also look correct.

Still to check:

1. The shared tooltip change affects other screens. BaseEducationalTooltip.tsx:165 now runs the on-screen check on first display for every shouldHideOnScroll tooltip. That includes the LHN product-training tooltip, the mileage rate tooltip and FieldRequirementSettingRow, regardless of beta. The check always reserves bottomTabHeight (72px), even on wide layouts that have no bottom tab bar. So an anchor in the bottom ~62px of the window now stays hidden. Before, it showed. This is low risk. To keep other screens unchanged, you could put this behind a prop that only the workspace menu passes.
2. NetSuite tax and travel-billing pages still go back to /accounting. NetSuiteTaxPostingAccountSelectPage.tsx:40, NetSuiteProvincialTaxPostingAccountSelectPage.tsx:38 and NetSuiteTravelBillingConfigurationPage.tsx:44 go back to /accounting/netsuite-export. That route isn't in the stack when you start from the Configure panel. This PR doesn't touch these pages, but they have the same Back problem you just fixed elsewhere. I haven't reproduced it.

Waiting on decisions, not code: a way to turn MCP off for beta users (design question above), and the /connections Not Found when the beta is turned off. You chose not to add a fallback for that.

I only read the code for this pass. I didn't run a browser test, because these flows need connected NetSuite, QBO, Xero, Sage or Certinia workspaces.

Next Steps: Reply with @MelvinBot <your feedback> to refine this review.

view run

@situchan ready for re-review again.

Since your last review:

• Back from accounting settings: goes back to the Configure panel instead of /accounting. This covers QBO, Xero, Sage Intacct, QuickBooks Desktop, Certinia and NetSuite, including their export sub-pages.
• HR final approver: goes back to the Configure panel after you pick someone.
• Sync results: no more Not Found when a sync finishes while you're on an old page like /accounting.
• Landscape tooltip: hidden while the Connections menu item is off screen. The change only applies to the workspace menu, so other tooltips are unchanged.
• MCP help link: back on the AI tab.
• Connections tooltip: now only shows on workspaces that already have a connection.

Only one item still needs a call: how admins turn MCP off when the beta is on. Waiting on @dubielzyk-expensify (question).

@dubielzyk-expensify should we keep the MCP toggle in More features for beta users, or add a Configure panel on the MCP card with an on/off switch?

Does the MCP toggle do anything functionally than turn the nav item on? Cause otherwise my plan for this tab was to basically list all the MCP integrations in the AI tab and then have a generic MCP tab that acts as the AI help link:

Curious to hear what @trjExpensify and @Expensify/design thinks about that.

Does the MCP toggle do anything functionally than turn the nav item on?

I think it just turns the nav item on. I'm not quite following your proposal though, I think I'm having a hard time understanding the arrows 🤣 might need a new mock!

@dubielzyk-expensify @shawnborton The MCP toggle only shows or hides the MCP nav item. With the beta on, that item is replaced by Connections, the same as Accounting and HR, so the toggle has nothing left to control. That's why I hid it along with the other integration toggles. Unless the backend uses isMCPEnabled to block MCP access, I think we don't need an off switch.

@lakchote could you please confirm this?

We did not find an internal engineer to review this PR, trying to assign a random engineer to #101509 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

Fresh review at c35c2c9

Beta off: one minor regression. Some sub-pages now call a plain goBack(). On a deep link or refresh, Back closes the panel instead of opening the parent page. Everything else matches main, including the shared TabSelector, MenuItem and EducationalTooltip changes.

Beta on: 3 confirmed regressions and 3 that need a check. The fixes from a85c32b–c35c2c9 work: Back to the Configure panel, Final approver, sync results, the landscape tooltip and the MCP help link. I read the code only and didn't run it. These flows need workspaces with live integrations.

Regressions

Beta off and on

1. Back skips the parent page on a deep link or refresh. These pages went back to a fixed parent route. They now call goBack(), which only pops the stack:

   • NetSuiteTaxPostingAccountSelectPage.tsx:50,78
   • NetSuiteProvincialTaxPostingAccountSelectPage and NetSuiteTravelBillingConfigurationPage
   • QuickbooksDesktopAutoSyncPageBase.tsx:44. Its only caller doesn't pass navigateBackTo.

   Repro: refresh on …/connections/netsuite/export/tax-posting-account/select, then press Back. You land on Accounting instead of NetSuite Export. Normal in-app navigation still works. Fix: keep a fallback route that points to the panel or the old page, depending on the beta.

Beta on

2. A failed Uber disconnect shows no error. If the API fails, uber comes back with errorFields. The old page showed a red dot for that. The new card only treats the enter-credentials error as broken (useReceiptPartnerConnectionListings.ts:75-79). The card goes back to "Active".

3. Replacing an HR provider deletes the old one first. useMergeConnectionListings.ts:119-120 calls removePolicyConnection, then opens Merge Link. If the admin closes Merge Link, the workspace has no HR connection. It also loses its approval mode and final approver settings. The Replace modal was agreed, but this order loses data.

4. Links into a connection's settings now open the All tab. withUnifiedConnectionsBeta.tsx renders Connections on old routes with no tab or panel selected. The user must find the card and click Configure. Affected entry points:

   • The Home "Fix" item (FixPolicyConnection)
   • The workflow "configured in " link (WorkflowUtils)
   • "Configure HR sync" on Members
   • ImportedFromAccountingSoftware and the Rules empty states

   For a broken connection, consider opening the matching panel.

Needs a check (depends on backend data or timing)

5. Uber "+" may do nothing. useReceiptPartnerConnectionListings.ts:57-60 returns silently when connectFormData is missing. That check runs before the feature turns on. If the API only sends this data when Receipt partners is on, Uber can't be connected from Connections. ClaimOfferPage would open UBER_CONNECT_URL?undefined.
6. An unexpected Uber invite screen may open. useReceiptPartnerConnectionListings.ts:35-45 opens the invite flow when "connected" changes from false to true. It doesn't check whether the screen is focused. If uber.enabled only arrives with the receipt partners fetch, this can fire on every cold visit to Connections.
7. Panel deep links can redirect to Connections on a cold start. ConnectionsMergePageBase checks a stored "data fetched" flag. ConnectionsReceiptPartnersPage waits on policy.isLoading instead of isLoadingReceiptPartners. Either page can decide "not connected" before the data loads.

Code quality

1. ConnectionsAccountingPage.tsx copies about 450 lines from PolicyAccountingPage.tsx. It copies the integration derivation, the overflow menu, the 9-integration settings switch, the menu items and the QBO expiry hint. They have already drifted: the copy dropped a wrapperStyle, and disconnect behaves differently. Every integration fix now has to land twice for as long as the beta lives. Move the shared code into a hook such as useConnectedAccountingIntegration and use it in both pages. The same applies to:

   • ConnectionsReceiptPartnersPage: about 150 lines from WorkspaceReceiptPartnersPage
   • ConnectionsMergeProviderCard: about 100 lines from MergeProviderCard, and it renders a full page, not a card
   • ConnectionsAccountingPageQBOTokenExpiryTest: nearly the same as the existing test

2. The beta check uses 5 mechanisms across about 24 files:

   • The HOC
   • shouldBeBlocked
   • A boolean on getAccountingConnectionsRoute
   • A 15th positional argument on getAccountingIntegrationData, so callers pass runs of undefined
   • Inline checks

   Removing the beta later means finding all of them. Use one useUnifiedConnections() hook or route helper, and switch getAccountingIntegrationData to an options object.

3. "Turn the feature on when connecting" is repeated in 5 places. Each enablePolicy* function also gained a positional shouldGoBack, so calls read enablePolicyHR(id, true, false). One helper with a named option would fix both. useAccountingConnectionListings also repeats the upgrade check that startIntegrationFlow already does.

4. The panels both redirect and block on "not connected". useRedirectUnconnectedPanelToConnections plus shouldBeBlocked={… || !connected} appear in all three panels. Which one wins is a race. Keep one.

5. TabSelectorBase re-renders every tab on every scroll frame. It stores offset and widths in state (TabSelectorBase.tsx:53-89). Only store canScrollLeft and canScrollRight. The SVG gradient IDs in TabSelectorScrollFade are fixed strings, so two faded selectors on one page would collide. Use useId.

6. The empty-state text is built from fragments. WorkspaceConnectionsPage.tsx:329-331 joins a prompt, ' ', a link and noResultsPromptEnd, which is just '.'. This adds a space in Japanese and forces English word order. Use one translated string with an inline link.

7. The tooltip logic lives inline in WorkspaceInitialPage. It adds about 30 lines of state, refs and effects, plus a custom render that repeats renderProductTrainingTooltip. Extract a useConnectionsMovedTooltip() hook.

8. Smaller items:

   • withUnifiedConnectionsBeta casts with props as unknown as ….
   • WorkspaceConnectionsPage subscribes to all of ACCOUNT to read two fields. Add a selector.
   • ConnectionsReceiptPartnersPage reuses the old page's testID and has an unexplained exhaustive-deps disable.
   • Tests mock out AccessOrNotFoundWrapper, so the beta and not-connected gates are never tested. The listing hooks and withUnifiedConnectionsBeta have no tests.

Next Steps: Reply with @MelvinBot <your feedback> to refine this review.

view run

I'm not quite following your proposal though, I think I'm having a hard time understanding the arrows 🤣

Let me try to explain what the arrows are showing...

• Previously, each "AI integration" had a Connect button. On the new connections page, those Connect buttons are replaced by the Plus icons in the connection cards (for ChatGPT, Claude, and Cursor)
• On the previous MCP > Connections card, we displayed that little line at the bottom about needing help connecting, with a link to the help site (or wherever). On the new connections page, Jon has just added a generic MCP card that links to the guide

Does that make sense? 😅

@Krishna2323 yea confirmed, nothing in the backend uses isMCPEnabled to block MCP access. Auth and Web-E only store it, and the MCP server doesn't check it, so the toggle only controls the MCP nav item and page in App. Fine to hide it with the other integration toggles.